Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 26 11:53:43 PDT 2014