Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 11:44:44 PDT 2014