Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 01:09:42 PDT 2014