Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 00:33:49 PDT 2014