Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 13:27:42 PDT 2014