Merge remote-tracking branch 'upstream/develop' into 6915_uninitializedExtents

# Conflicts:
#	tsk/fs/tsk_ext2fs.h

tsk/fs/tsk_ext2fs.h

@@ -367,7 +367,7 @@ extern "C" {
 
 #define EXT2_MAX_INIT_EXTENT_LENGTH 0x8000  /* Maximum length of an initialized extent */
 
-/* MODE */
+/* MODE - Note that values are in octal format */
 #define EXT2_IN_FMT  0170000
 #define EXT2_IN_SOCK 0140000
 #define EXT2_IN_LNK  0120000