Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 02:05:38 PDT 2014