Use only one folder level for aperture
Merge remote-tracking branch 'upstream/master'
Fix js error from previous merge