Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 02:57:45 PDT 2014