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