Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 22:48:42 PDT 2014