Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 16:33:44 PDT 2014