Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 03:53:44 PDT 2014