Merge remote-tracking branch 'origin/master'

Conflicts:
	misc/edu.jhuapl.tacdogs.android.dynaform.apk