Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 19:49:38 PDT 2014